From 7c9d0a2c09b63649b643df656389a8129835bb3c Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 7 Feb 2020 15:26:56 +0000
Subject: [PATCH] no-openssl

don't add -lssl etc if not needed (because we use system-postgresql)


Gbp-Pq: Name no-openssl.diff
---
 RepositoryExternal.mk                        |  72 +------------------
 config_host.mk.in                            |   4 --
 configure.ac                                 | Bin 467551 -> 465006 bytes
 connectivity/Library_postgresql-sdbc-impl.mk |   1 -
 external/Module_external.mk                  |   1 -
 oox/CppunitTest_oox_tokenmap.mk              |   9 ---
 oox/Library_oox.mk                           |   9 ---
 ucb/CppunitTest_ucb_webdav_local_neon.mk     |   1 -
 ucb/CppunitTest_ucb_webdav_neon_opts.mk      |   1 -
 ucb/CppunitTest_ucb_webdav_propfindcache.mk  |   1 -
 ucb/CppunitTest_ucb_webdav_res_access.mk     |   1 -
 ucb/Library_ucpdav1.mk                       |   2 -
 12 files changed, 2 insertions(+), 100 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0029ae7bc69..47cf9ba464f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1517,75 +1517,6 @@ endef
 
 endif # SYSTEM_HARFBUZZ
 
-ifeq ($(DISABLE_OPENSSL),TRUE)
-
-gb_ExternalProject__use_openssl:=
-gb_LinkTarget__use_openssl_headers:=
-gb_LinkTarget__use_openssl:=
-
-else # !DISABLE_OPENSSL
-
-ifneq ($(SYSTEM_OPENSSL),)
-
-gb_LinkTarget__use_openssl_headers:=
-gb_ExternalProject__use_openssl:=
-
-define gb_LinkTarget__use_openssl
-$(call gb_LinkTarget_set_include,$(1),\
-	$$(INCLUDE) \
-	$(OPENSSL_CFLAGS) \
-)
-$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS))
-
-endef
-
-else # !SYSTEM_OPENSSL
-
-$(eval $(call gb_Helper_register_packages_for_install,ooo, \
-	openssl \
-))
-
-define gb_ExternalProject__use_openssl
-$(call gb_ExternalProject_use_package,$(1),openssl)
-
-endef
-
-define gb_LinkTarget__use_openssl_headers
-$(call gb_LinkTarget_use_external_project,$(1),openssl)
-$(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
-	$$(INCLUDE) \
-)
-
-endef
-
-define gb_LinkTarget__use_openssl
-$(call gb_LinkTarget_use_package,$(1),openssl)
-ifeq ($(OS),WNT)
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \
-	$(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \
-)
-else
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \
-	$(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \
-)
-$(call gb_LinkTarget_use_external_project,$(1),openssl)
-ifeq ($(OS),SOLARIS)
-$(call gb_LinkTarget_add_libs,$(1),\
-	-lnsl \
-	-lsocket \
-)
-endif
-endif
-
-endef
-
-endif # SYSTEM_OPENSSL
-endif # DISABLE_OPENSSL
-
-
 ifeq ($(DISABLE_OPENSSL),TRUE)
 
 define gb_LinkTarget__use_gnutls
@@ -3035,9 +2966,10 @@ $(call gb_LinkTarget_add_libs,$(1),\
 	$(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \
 )
 
-ifeq ($(OS),WNT)
 $(call gb_LinkTarget_use_external,$(1),openssl)
 
+ifeq ($(OS),WNT)
+
 $(call gb_LinkTarget_use_system_win32_libs,$(1),\
 	secur32 \
 	ws2_32 \
diff --git a/config_host.mk.in b/config_host.mk.in
index 81d09e48da7..51466523b94 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -110,7 +110,6 @@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
-export DISABLE_OPENSSL=@DISABLE_OPENSSL@
 export DISABLE_PYTHON=@DISABLE_PYTHON@
 export DLOPEN_LIBS=@DLOPEN_LIBS@
 export DLLTOOL=@DLLTOOL@
@@ -427,8 +426,6 @@ export OFFICEOTRON=@OFFICEOTRON@
 export BFFVALIDATOR=@BFFVALIDATOR@
 export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
 export OOO_VENDOR=@OOO_VENDOR@
-export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
-export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
 export OPENSYMBOL_TTF=@OPENSYMBOL_TTF@
 export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
 export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
@@ -567,7 +564,6 @@ export SYSTEM_NSS=@SYSTEM_NSS@
 export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
 export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@
 export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
-export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
 export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@
 export SYSTEM_POPPLER=@SYSTEM_POPPLER@
 export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
diff --git a/configure.ac b/configure.ac
index bad3a766a6ff4e85e2c00a394071247db9507406..73ff5d35d62ce2005c1ae3e92a5681aa13b6c208 100644
GIT binary patch
delta 29
lcmcbAMCRQFnT8g|7N!>F7M3ln+ltzk*RXD1Uc<IyDFDN54B-F(

delta 1628
zcmcgsO>7%Q6qeUsn`}TRbrMQw%d;Dz1Z5q&q%k2F$$xDlQrl!xQIw|3+B=R{-Rvwo
z8#z7&q)6pPr2vm373u}45|L2ggg`=^dPs#h6Al$ODB@l*ws##!4M%*itmk>(`{tYP
zd%t~g>gVrIy}J|G5q5$*p)bXK2M?YVBN1v7i!pOIr7S*OSX8pPrJ`D{6ibS-gn_N_
znGxM!TGb>_<_CEZHkr0g@R!@dFv>}B0HdD^F?{>|zySXAlrSV0G^c4;umEm@SQ2=j
zv%PkMflh3P)HIjqyYHo=CsWBp8mI#%uQ-XL7QFXqAhD31P0r2F&doF%E!kkQX4@u_
zeFVc=m%R(fh9z%kHOk~vQclaJL9GtJOX=D4`T5lBjA>MBPRn*_ubb#H?KH`}YwM^_
z!iVF+$e;(Dv8aUC2F3WcS6G`~^#tO-{MuB9H!+PmxP-Y7A6F@hLk8j{;^ve>9Ax^p
zVwsEic(veY>(shnw&HNDr$bx8i3yI1AC|-u;qG(c8*{;v_`$7!h>ymFi0*T35!P!|
z-cnYIm;J}gtSnzC_WtuOpyn?uWiKk3$LdRqIVBU9P3{bk&8}{{f9O%v2gR}H{7d%{
z0+Ww8F*`0i={pODriAD5@M`G9GhQFCP1~l9%Rsr5J)b&<-&Mphyyt`maf}9E_?U$y
zU;G)?(D2rHa3tD2s^(X&LXBE3*>V@~ItwRbKB!A6P*YDpi4YxL%Rn+QpLjX3Hr0k7
z4wWmDdA$EwD24~4g0y|i>Roj@GMt5`=2+amnhTogHt6Ph;~(zr=0TqZ)?zN%0B$Tt
za}2^@Lu<9oO)MR#1%}(f%jVU~%0>0f>~d*xwd{pxyP+|t5@LZDuQqSWZ>AIewP713
zze9sK1e%6va^M?;2af=)b6BWuy8VaO9Ku5chNT-kVXjApST)XWt!q(D*VU$mcRvv#
z+diBBpG;h;8&X~3+9+3Y%F5*GvG?F)rK2bjtG$8LnqhNERPVvns#d$frEZ6e+rFET
zPV$anp>{J6#p%1Egj@T;;gP;5xc8%YdiUV^6Zqn^5G`~^^>&Llimw7s#dawFlNCRT
zv3CN1-|U43M*G9z?+-$+2z3K*-w&R~Ge3xt0$-XvuX#hE&Ud5ZnloLHM1xZ(mO6Vn
zzgW3cT=o;L=Cb+Mi>1OxF)`{*JgyZE{VJXt?cavwKf@Dv_#iCd;j6*Ozn$9qR;=K|
RMo_xB?}%URJK?YI`~}>%7m)w}

diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index c372f3f0c6f..0343adb24bd 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
 	boost_headers \
 	postgresql \
 	$(if $(filter-out MSC,$(COM)), \
-		openssl \
 		$(if $(ENABLE_LDAP),openldap) \
 		nss3 \
 		plc4 \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index baf7215b2b7..b8d18f6ae85 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -79,7 +79,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,NSS,nss) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,OPENLDAP,openldap) \
-	$(call gb_Helper_optional,OPENSSL,openssl) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \
 	$(call gb_Helper_optional,PAGEMAKER,libpagemaker) \
diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
index 8019da7a230..0c6ab952a81 100644
--- a/oox/CppunitTest_oox_tokenmap.mk
+++ b/oox/CppunitTest_oox_tokenmap.mk
@@ -20,19 +20,10 @@ $(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap))
 
 $(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox))
 
-ifeq ($(TLS),OPENSSL)
-$(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\
-	openssl \
-	openssl_headers \
-))
-else
-ifeq ($(TLS),NSS)
 $(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\
        plc4 \
        nss3 \
 ))
-endif
-endif
 
 $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
     avmedia \
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index cc235b87e36..150f6d65fcc 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -67,19 +67,10 @@ $(eval $(call gb_Library_use_externals,oox,\
 	boost_headers \
 ))
 
-ifeq ($(TLS),OPENSSL)
-$(eval $(call gb_Library_use_externals,oox,\
-	openssl \
-	openssl_headers \
-))
-else
-ifeq ($(TLS),NSS)
 $(eval $(call gb_Library_use_externals,oox,\
        plc4 \
        nss3 \
 ))
-endif
-endif
 
 $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox))
 
diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk
index 2e920f4ca03..a4ea2358d2f 100644
--- a/ucb/CppunitTest_ucb_webdav_local_neon.mk
+++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_local_neon,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_local_neon,\
diff --git a/ucb/CppunitTest_ucb_webdav_neon_opts.mk b/ucb/CppunitTest_ucb_webdav_neon_opts.mk
index df670ed7afd..020d9f9b6dd 100644
--- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk
+++ b/ucb/CppunitTest_ucb_webdav_neon_opts.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_neon_opts,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_neon_opts,\
diff --git a/ucb/CppunitTest_ucb_webdav_propfindcache.mk b/ucb/CppunitTest_ucb_webdav_propfindcache.mk
index 8d4a12d32ad..8504a0200ae 100644
--- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk
+++ b/ucb/CppunitTest_ucb_webdav_propfindcache.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_propfindcache,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_propfindcache,\
diff --git a/ucb/CppunitTest_ucb_webdav_res_access.mk b/ucb/CppunitTest_ucb_webdav_res_access.mk
index fa0669987bd..ad25d29f945 100644
--- a/ucb/CppunitTest_ucb_webdav_res_access.mk
+++ b/ucb/CppunitTest_ucb_webdav_res_access.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_res_access,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_res_access,\
diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index c76489bd484..2496b80c769 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
 	libxml2 \
 	neon \
-	openssl \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,ucpdav1,\
@@ -73,7 +72,6 @@ else # WITH_WEBDAV == serf
 $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
 	apr \
-	openssl \
 	serf \
 	zlib \
 ))
-- 
2.30.2